X-Git-Url: https://shimmer.witbreuk.eu/gitweb/UltimateKEYS.git/blobdiff_plain/fdedca82be3d839f10e106cd5b926a8193bf463f..1be996810f077335f8b795bd50366320725d3e3d:/autohotkey/UltimateKEYS%20(for%20AutoHotkey%20v2).ahk?ds=sidebyside

diff --git a/autohotkey/UltimateKEYS (for AutoHotkey v2).ahk b/autohotkey/UltimateKEYS (for AutoHotkey v2).ahk
index 3287533..f7bfeee 100644
--- a/autohotkey/UltimateKEYS (for AutoHotkey v2).ahk	
+++ b/autohotkey/UltimateKEYS (for AutoHotkey v2).ahk	
@@ -1,6 +1,6 @@
 #requires AutoHotkey v2
 
-; UltimateKEYS (for AutoHotkey v2).ahk - 2023-09-05
+; UltimateKEYS (for AutoHotkey v2).ahk - 2023-12-12
 
 ; Website :  www.ultimatekeys.info (pieter-degroote.github.io/UltimateKEYS/)
 
@@ -767,7 +767,7 @@ cmpQuad["2"] := "{u+2000}"  ; en quad
 cmpQuad["3"] := "{u+2001}"  ; em quad
 
 
-; Compose :  Arrows and Pointers
+; Compose :  Arrows and Pointing Triangles
 
 global cmpArrow := Map()
 cmpArrow["w"] := "{u+25b2}"  ; (▲) black up-pointing triangle
@@ -925,7 +925,6 @@ cmpCapitalT["H"] := "{u+00de}"   ; (Þ) capital letter thorn
 
 global cmpDigitEight := Map()
 global cmpCapitalP := Map()
-global cmpSemicolon := Map()
 global cmpAsterisk := Map()
 global cmpExclam := Map()
 global cmpQuestion := Map()
@@ -950,14 +949,6 @@ cmpSmallR["4"] := "{u+221c}"        ; (∜) fourth root
 cmpSymbols["o"] := "{u+00a7}"       ; (§) section sign
 cmpCapitalS["o"] := "{u+00a7}"      ; (§) section sign
 cmpSmallT["m"] := "{u+2122}"        ; (™) trademark symbol
-cmpSemicolon["b"] := "{u+2022}"     ; (•) bullet
-cmpSemicolon[";"] := "{u+2022}"     ; (•) bullet
-cmpSemicolon["t"] := "{u+2023}"     ; (‣) triangular bullet
-cmpSemicolon[">"] := "{u+2023}"     ; (‣) triangular bullet
-cmpSemicolon["h"] := "{u+2043}"     ; (⁃) hyphen bullet
-cmpSemicolon["-"] := "{u+2043}"     ; (⁃) hyphen bullet
-cmpSemicolon["w"] := "{u+25e6}"     ; (◦) white bullet
-cmpSemicolon["o"] := "{u+25e6}"     ; (◦) white bullet
 cmpAcuteAccent["1"] := "{u+2032}"   ; (′) prime
 cmpAcuteAccent["2"] := "{u+2033}"   ; (″) double prime
 cmpAcuteAccent["3"] := "{u+2034}"   ; (‴) triple prime
@@ -992,6 +983,26 @@ cmpGreaterThan["+"] := "{u+2a7e}"   ; (⩾) greater-than or slanted equal to
 cmpTilde["~"] := "{u+2248}"         ; (≈) almost equal to
 
 
+; Compose :  Bullets and Small Geometric Shapes (;)
+
+global cmpSemicolon := Map()
+cmpSemicolon["b"] := "{u+2022}"  ; (•) bullet
+cmpSemicolon["o"] := "{u+25e6}"  ; (◦) white bullet
+cmpSemicolon["h"] := "{u+2043}"  ; (⁃) hyphen bullet
+cmpSemicolon["t"] := "{u+2023}"  ; (‣) triangular bullet
+cmpSemicolon["q"] := "{u+25aa}"  ; (▪) black small square
+cmpSemicolon["r"] := "{u+25ab}"  ; (▫) white small square
+cmpSemicolon["w"] := "{u+25b4}"  ; (▴) black up-pointing small triangle
+cmpSemicolon["a"] := "{u+25c2}"  ; (◂) black left-pointing small triangle
+cmpSemicolon["s"] := "{u+25be}"  ; (▾) black down-pointing small triangle
+cmpSemicolon["d"] := "{u+25b8}"  ; (▸) black right-pointing small triangle
+cmpSemicolon["i"] := "{u+25b5}"  ; (▵) white up-pointing small triangle
+cmpSemicolon["j"] := "{u+25c3}"  ; (◃) white left-pointing small triangle
+cmpSemicolon["k"] := "{u+25bf}"  ; (▿) white down-pointing small triangle
+cmpSemicolon["l"] := "{u+25b9}"  ; (▹) white right-pointing small triangle
+cmpSemicolon[";"] := "{u+2022}"  ; (•) bullet
+
+
 ; Compose :  Vulgar Fractions
 
 global cmpDigitOne := Map()
@@ -1031,6 +1042,7 @@ cmpCedillaOgonek[chr(34)] := "{u+201e}"  ; („) double low-9 quotation mark
 cmpDiaeresis[","] := "{u+201e}"          ; („) double low-9 quotation mark
 cmpCedillaOgonek["'"] := "{u+201a}"      ; (‚) single low-9 quotation mark
 cmpAcuteAccent[","] := "{u+201a}"        ; (‚) single low-9 quotation mark
+cmpCedillaOgonek[","] := "{u+201a}"      ; (‚) single low-9 quotation mark
 cmpDiaeresis["["] := "{u+201c}"          ; (“) left double quotation mark
 cmpBracketLeft[chr(34)] := "{u+201c}"    ; (“) left double quotation mark
 cmpDiaeresis["]"] := "{u+201d}"          ; (”) right double quotation mark
@@ -1259,6 +1271,8 @@ cmpDigitTwo["s"] := "{u+2691}"  ; (⚑) black flag
 cmpDigitTwo["t"] := "{u+26a0}"  ; (⚠) warning sign
 cmpDigitTwo["u"] := "{u+26a1}"  ; (⚡) high voltage sign
 cmpDigitTwo["v"] := "{u+26d4}"  ; (⛔) no entry
+cmpDigitTwo["w"] := "{u+231a}"  ; (⌚) watch
+cmpDigitTwo["x"] := "{u+231b}"  ; (⌛) hourglass
 
 cmpDigitThree["a"] := "{u+2701}"  ; (✁) upper blade scissors
 cmpDigitThree["b"] := "{u+2702}"  ; (✂) black scissors
@@ -1878,7 +1892,9 @@ cmpSmallN["0"] := "{u+277f}"  ; (❿) dingbat negative circled digit 10
 ; Configuration :  Compose Key Selector
 
 >!`::
->!sc056:: {
+>!~::
+>!sc056::
+>!+sc056:: {
   ihA := InputHook("L1", gEndKeys)
   ihA.Start()
   ihA.Wait()
@@ -2043,10 +2059,6 @@ cmpSmallN["0"] := "{u+277f}"  ; (❿) dingbat negative circled digit 10
     if cmpCapitalP.Has(ihB.Input)
       Send cmpCapitalP[ihB.Input]
   }
-  else if (ihA.Input == ";") {
-    if cmpSemicolon.Has(ihB.Input)
-      Send cmpSemicolon[ihB.Input]
-  }
   else if (ihA.Input == "*") {
     if cmpAsterisk.Has(ihB.Input)
       Send cmpAsterisk[ihB.Input]
@@ -2083,6 +2095,10 @@ cmpSmallN["0"] := "{u+277f}"  ; (❿) dingbat negative circled digit 10
     if cmpGreaterThan.Has(ihB.Input)
       Send cmpGreaterThan[ihB.Input]
   }
+  else if (ihA.Input == ";") {
+    if cmpSemicolon.Has(ihB.Input)
+      Send cmpSemicolon[ihB.Input]
+  }
   else if (ihA.Input == "1") {
     if cmpDigitOne.Has(ihB.Input)
       Send cmpDigitOne[ihB.Input]